Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: Merge support into master #3002

Merged
merged 3 commits into from
Oct 24, 2024
Merged

Conversation

alanbsmith
Copy link
Member

This pull request was automatically created by an automated forward-merge job. The automated job failed automated checks and must be resolved manually.
Reasons for failure may include:

  • Merge conflicts that cannot be automatically resolved
  • A merge resulted in check failures
    • Lint or type errors
    • Test failures
    • Unexpected visual changes
      The pull request should inform you of merge conflicts before you start if any.
  1. Run the following commands in your terminal. If this succeeds, skip step 2. The last command will run a script that tries to merge and resolve conflicts automatically.
    git branch -D merge/support-into-master || true
    git fetch upstream
    git checkout --track upstream/merge/support-into-master
    git pull upstream merge/support-into-master -f
    git pull upstream support
    node utils/forward-merge.js
    
  2. If the previous step succeeded, skip to step 4.
  3. Resolve conflicts manually. Then run the following.
    git add .
    git commit -m "chore: Merge support into master"
    
  4. Push the merge commit back to the pull request
    git push upstream merge/support-into-master
    

If there were no merge conflicts, the forward-merge job failed because of a test failure. You can wait for the pull request to give errors, or you can check the logs for failures. You'll have to update code to fix errors.
This pull request will be merged using the merge strategy instead of the squash strategy. This means any commit in the log will show in the branch's history. Any commit you make should amend the merge commit. Use the following command:

git commit --amend --no-edit

You must then force-push the branch and the CI will rerun verification.
Use the automerge label like normal and the CI will pick the correct merge strategy.

Copy link

cypress bot commented Oct 24, 2024

Workday/canvas-kit    Run #7938

Run Properties:  status check passed Passed #7938  •  git commit 874c45caa7 ℹ️: Merge b23a06600bc305186d0ae2ed34e2c6f02d2fc3f5 into cc29f641cfd65e404e4f748b6366...
Project Workday/canvas-kit
Branch Review merge/support-into-master
Run status status check passed Passed #7938
Run duration 04m 00s
Commit git commit 874c45caa7 ℹ️: Merge b23a06600bc305186d0ae2ed34e2c6f02d2fc3f5 into cc29f641cfd65e404e4f748b6366...
Committer Alan B Smith
View all properties for this run ↗︎

Test results
Tests that failed  Failures 0
Tests that were flaky  Flaky 33
Tests that did not run due to a developer annotating a test with .skip  Pending 24
Tests that did not run due to a failure in a mocha hook  Skipped 0
Tests that passed  Passing 1092
View all changes introduced in this branch ↗︎
UI Coverage  21.78%
  Untested elements 1643  
  Tested elements 455  
Accessibility  99.17%
  Failed rules  5 critical   5 serious   0 moderate   2 minor
  Failed elements 182  

@alanbsmith alanbsmith merged commit 5681161 into master Oct 24, 2024
18 of 19 checks passed
@alanbsmith alanbsmith deleted the merge/support-into-master branch October 24, 2024 18:38
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: ✅ Done
Development

Successfully merging this pull request may close these issues.

2 participants